Autogenerated HTML docs for v1.5.4.3-484-g60e3
diff --git a/git-config.html b/git-config.html index e39570e..9be8b83 100644 --- a/git-config.html +++ b/git-config.html
@@ -1507,6 +1507,16 @@ </p> </dd> <dt> +format.pretty +</dt> +<dd> +<p> + The default pretty format for log/show/whatchanged command, + See <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, + <a href="git-whatchanged.html">git-whatchanged(1)</a>. +</p> +</dd> +<dt> gc.aggressiveWindow </dt> <dd> @@ -1879,8 +1889,10 @@ <dd> <p> Controls which merge resolution program is used by - <a href="git-mergetool.html">git-mergetool(1)</a>. Valid values are: "kdiff3", "tkdiff", - "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff". + <a href="git-mergetool.html">git-mergetool(1)</a>. Valid built-in values are: "kdiff3", + "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and + "opendiff". Any other value is treated is custom merge tool + and there must be a corresponing mergetool.<tool>.cmd option. </p> </dd> <dt> @@ -1934,6 +1946,46 @@ </p> </dd> <dt> +mergetool.<tool>.cmd +</dt> +<dd> +<p> + Specify the command to invoke the specified merge tool. The + specified command is evaluated in shell with the following + variables available: <em>BASE</em> is the name of a temporary file + containing the common base of the files to be merged, if available; + <em>LOCAL</em> is the name of a temporary file containing the contents of + the file on the current branch; <em>REMOTE</em> is the name of a temporary + file containing the contents of the file from the branch being + merged; <em>MERGED</em> contains the name of the file to which the merge + tool should write the results of a successful merge. +</p> +</dd> +<dt> +mergetool.<tool>.trustExitCode +</dt> +<dd> +<p> + For a custom merge command, specify whether the exit code of + the merge command can be used to determine whether the merge was + successful. If this is not set to true then the merge target file + timestamp is checked and the merge assumed to have been successful + if the file has been updated, otherwise the user is prompted to + indicate the success of the merge. +</p> +</dd> +<dt> +mergetool.keepBackup +</dt> +<dd> +<p> + After performing a merge, the original file with conflict markers + can be saved as a file with a <tt>.orig</tt> extension. If this variable + is set to <tt>false</tt> then this file is not preserved. Defaults to + <tt>true</tt> (i.e. keep the backup files). +</p> +</dd> +<dt> pack.window </dt> <dd> @@ -2100,7 +2152,7 @@ <dd> <p> The default program to execute on the remote side when pushing. See - option --exec of <a href="git-push.html">git-push(1)</a>. + option --receive-pack of <a href="git-push.html">git-push(1)</a>. </p> </dd> <dt> @@ -2109,7 +2161,7 @@ <dd> <p> The default program to execute on the remote side when fetching. See - option --exec of <a href="git-fetch-pack.html">git-fetch-pack(1)</a>. + option --upload-pack of <a href="git-fetch-pack.html">git-fetch-pack(1)</a>. </p> </dd> <dt> @@ -2117,8 +2169,8 @@ </dt> <dd> <p> - Setting this value to --no-tags disables automatic tag following when fetching - from remote <name> + Setting this value to --no-tags disables automatic tag following when + fetching from remote <name> </p> </dd> <dt> @@ -2308,7 +2360,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 04-Mar-2008 12:05:57 UTC +Last updated 08-Mar-2008 09:29:57 UTC </div> </div> </body>
